Merge version 4:25.04.0-1+rpi1 and 4:25.08.1-2 to produce 4:25.08.1-2+rpi1

diff --cc debian/changelog
index 5d60e06db610643e5fe9def7668ce8255a44120b,8f19ea09da4743347be354eb70d6e88748b566b8..c52292a4b489dfc37ac0b91069639dfb48bd16df
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,27 +1,35 @@@
- marble (4:25.04.0-1+rpi1) trixie-staging; urgency=medium
++marble (4:25.08.1-2+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 4:24.12.3-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 04 May 2025 06:29:14 +0000]
 +  * Remove armhf from qtwebengine architecture lists.
 +  * Update symbols file for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 17 May 2025 03:37:12 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 08 Feb 2026 15:19:50 +0000
++
+ marble (4:25.08.1-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Update plasma-marble.install according to the newer libplasma, which does
+     not generate appstream metainfo files for plasma widgets by default anymore.
+ 
+  -- Pino Toscano <pino@debian.org>  Sat, 04 Oct 2025 07:11:03 +0200
+ 
+ marble (4:25.08.1-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Drop Rules-Requires-Root: no, no more needed since Debian trixie.
+   * Since the Plasma 6 is libraries are currently Linux-only, tweak the marble
+     source so it builds on non-Linux platforms:
+     - limit the libplasma-dev, and qml6-module-org-kde-plasma-plasma5support
+       build dependencies as linux-any
+     - limit the plasma-marble package as linux-any
+   * Replace the -DBUILD_MARBLE_TESTS=FALSE cmake option with -DBUILD_TESTING=OFF
+     to properly disable the build of the tests.
+   * Update the patches:
+     - do_not_install_private_headers: refresh
+ 
+  -- Pino Toscano <pino@debian.org>  Fri, 03 Oct 2025 21:02:41 +0200
  
  marble (4:25.04.0-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge